projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f23b1db 82c82b1)
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Mon, 31 Dec 2018 01:02:40 +0000 (17:02 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 31 Dec 2018 01:02:40 +0000 (17:02 -0800)
commit433b6a74ec73608ff06106daee4f53c5175d5297
tree1be58fb0808c683eb4b488a95555e2e24206ea61tree | snapshot
parentf23b1db37a816ab88a5970e67d1aaeb7f68ca47ccommit | diff
parent82c82b1c773f441fe424b7ed1757c8eda31814c0commit | diff
Merge from origin/emacs-26

82c82b1 (origin/emacs-26) In user manual fix value of default frame h...
2e8825d Improve documentation of 'file-local-name' and related APIs
11f0635 ; Remove comment in esh-proc.el

# Conflicts:
# lisp/simple.el
doc/emacs/cmdargs.texi diff1 | diff2 | blob | history
doc/lispref/files.texi diff1 | diff2 | blob | history
doc/lispref/processes.texi diff1 | diff2 | blob | history
lisp/eshell/esh-proc.el diff1 | diff2 | blob | history
lisp/files.el diff1 | diff2 | blob | history
lisp/simple.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.